Autogenerated HTML docs for v1.8.1-336-g94702
diff --git a/RelNotes/1.8.2.txt b/RelNotes/1.8.2.txt index a6eb139..da27842 100644 --- a/RelNotes/1.8.2.txt +++ b/RelNotes/1.8.2.txt
@@ -54,6 +54,12 @@ is being exported, and uses the description for the branch, when asked to write a cover letter for the series. + * "git format-patch" learned "-v $count" option, and prepends a + string "v$count-" to the names of its output files, and also + automatically sets the subject prefix to "PATCH v$count". This + allows patches from rerolled series to be stored under different + names and makes it easier to reuse cover letter messsages. + * "git push" now requires "-f" to update a tag, even if it is a fast-forward, as tags are meant to be fixed points. @@ -119,6 +125,11 @@ signal and die. We ignore these signals now. (merge 1250857 pf/editor-ignore-sigint later to maint). + * A child process that was killed by a signal (e.g. SIGINT) was + reported in an inconsistent way depending on how the process was + spawned by us, with or without a shell in between. + (merge 709ca73 jk/unify-exit-code-by-receiving-signal later to maint). + * After failing to create a temporary file using mkstemp(), failing pathname was not reported correctly on some platforms. (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint). @@ -136,6 +147,10 @@ way that made NetBSD's implementation of "tar" sometimes unhappy. (merge 22f0dcd rs/leave-base-name-in-name-field-of-tar later to maint). + * "git archive" did not record uncompressed size in the header when + streaming a zip archive, which confused some implementations of unzip. + (merge 5ea2c84 rs/zip-with-uncompressed-size-in-the-header later to maint). + * When "git clone --separate-git-dir=$over_there" is interrupted, it failed to remove the real location of the $GIT_DIR it created. This was most visible when interrupting a submodule update.
diff --git a/git-fast-import.html b/git-fast-import.html index 73d8941..87a7b2c 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -775,6 +775,52 @@ <div class="sectionbody"> <div class="dlist"><dl> <dt class="hdlist1"> +--force +</dt> +<dd> +<p> + Force updating modified existing branches, even if doing + so would cause commits to be lost (as the new commit does + not contain the old commit). +</p> +</dd> +<dt class="hdlist1"> +--quiet +</dt> +<dd> +<p> + Disable all non-fatal output, making fast-import silent when it + is successful. This option disables the output shown by + --stats. +</p> +</dd> +<dt class="hdlist1"> +--stats +</dt> +<dd> +<p> + Display some basic statistics about the objects fast-import has + created, the packfiles they were stored into, and the + memory used by fast-import during this run. Showing this output + is currently the default, but can be disabled with --quiet. +</p> +</dd> +</dl></div> +<div class="sect2"> +<h3 id="_options_for_frontends">Options for Frontends</h3> +<div class="dlist"><dl> +<dt class="hdlist1"> +--cat-blob-fd=<fd> +</dt> +<dd> +<p> + Write responses to <code>cat-blob</code> and <code>ls</code> queries to the + file descriptor <fd> instead of <code>stdout</code>. Allows <code>progress</code> + output intended for the end-user to be separated from other + output. +</p> +</dd> +<dt class="hdlist1"> --date-format=<fmt> </dt> <dd> @@ -786,53 +832,21 @@ </p> </dd> <dt class="hdlist1"> ---force +--done </dt> <dd> <p> - Force updating modified existing branches, even if doing - so would cause commits to be lost (as the new commit does - not contain the old commit). + Terminate with error if there is no <code>done</code> command at the end of + the stream. This option might be useful for detecting errors + that cause the frontend to terminate before it has started to + write a stream. </p> </dd> -<dt class="hdlist1"> ---max-pack-size=<n> -</dt> -<dd> -<p> - Maximum size of each output packfile. - The default is unlimited. -</p> -</dd> -<dt class="hdlist1"> ---big-file-threshold=<n> -</dt> -<dd> -<p> - Maximum size of a blob that fast-import will attempt to - create a delta for, expressed in bytes. The default is 512m - (512 MiB). Some importers may wish to lower this on systems - with constrained memory. -</p> -</dd> -<dt class="hdlist1"> ---depth=<n> -</dt> -<dd> -<p> - Maximum delta depth, for blob and tree deltification. - Default is 10. -</p> -</dd> -<dt class="hdlist1"> ---active-branches=<n> -</dt> -<dd> -<p> - Maximum number of branches to maintain active at once. - See “Memory Utilization” below for details. Default is 5. -</p> -</dd> +</dl></div> +</div> +<div class="sect2"> +<h3 id="_locations_of_marks_files">Locations of Marks Files</h3> +<div class="dlist"><dl> <dt class="hdlist1"> --export-marks=<file> </dt> @@ -870,7 +884,7 @@ </p> </dd> <dt class="hdlist1"> ---relative-marks +--[no-]relative-marks </dt> <dd> <p> @@ -881,39 +895,41 @@ to the .git/info/fast-import directory. However, other importers may use a different location. </p> +<div class="paragraph"><p>Relative and non-relative marks may be combined by interweaving +--(no-)-relative-marks with the --(import|export)-marks= options.</p></div> </dd> +</dl></div> +</div> +<div class="sect2"> +<h3 id="_performance_and_compression_tuning">Performance and Compression Tuning</h3> +<div class="dlist"><dl> <dt class="hdlist1"> ---no-relative-marks +--active-branches=<n> </dt> <dd> <p> - Negates a previous --relative-marks. Allows for combining - relative and non-relative marks by interweaving - --(no-)-relative-marks with the --(import|export)-marks= - options. + Maximum number of branches to maintain active at once. + See “Memory Utilization” below for details. Default is 5. </p> </dd> <dt class="hdlist1"> ---cat-blob-fd=<fd> +--big-file-threshold=<n> </dt> <dd> <p> - Write responses to <code>cat-blob</code> and <code>ls</code> queries to the - file descriptor <fd> instead of <code>stdout</code>. Allows <code>progress</code> - output intended for the end-user to be separated from other - output. + Maximum size of a blob that fast-import will attempt to + create a delta for, expressed in bytes. The default is 512m + (512 MiB). Some importers may wish to lower this on systems + with constrained memory. </p> </dd> <dt class="hdlist1"> ---done +--depth=<n> </dt> <dd> <p> - Terminate with error if there is no <code>done</code> command at the - end of the stream. - This option might be useful for detecting errors that - cause the frontend to terminate before it has started to - write a stream. + Maximum delta depth, for blob and tree deltification. + Default is 10. </p> </dd> <dt class="hdlist1"> @@ -931,29 +947,18 @@ </p> </dd> <dt class="hdlist1"> ---quiet +--max-pack-size=<n> </dt> <dd> <p> - Disable all non-fatal output, making fast-import silent when it - is successful. This option disables the output shown by - --stats. -</p> -</dd> -<dt class="hdlist1"> ---stats -</dt> -<dd> -<p> - Display some basic statistics about the objects fast-import has - created, the packfiles they were stored into, and the - memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with --quiet. + Maximum size of each output packfile. + The default is unlimited. </p> </dd> </dl></div> </div> </div> +</div> <div class="sect1"> <h2 id="_performance">Performance</h2> <div class="sectionbody"> @@ -2439,7 +2444,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-01-08 16:14:48 PST +Last updated 2013-01-12 00:25:04 PST </div> </div> </body>
diff --git a/git-fast-import.txt b/git-fast-import.txt index 3da5cc2..bf1a02a 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -33,34 +33,46 @@ OPTIONS ------- ---date-format=<fmt>:: - Specify the type of dates the frontend will supply to - fast-import within `author`, `committer` and `tagger` commands. - See ``Date Formats'' below for details about which formats - are supported, and their syntax. --force:: Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit). ---max-pack-size=<n>:: - Maximum size of each output packfile. - The default is unlimited. +--quiet:: + Disable all non-fatal output, making fast-import silent when it + is successful. This option disables the output shown by + \--stats. ---big-file-threshold=<n>:: - Maximum size of a blob that fast-import will attempt to - create a delta for, expressed in bytes. The default is 512m - (512 MiB). Some importers may wish to lower this on systems - with constrained memory. +--stats:: + Display some basic statistics about the objects fast-import has + created, the packfiles they were stored into, and the + memory used by fast-import during this run. Showing this output + is currently the default, but can be disabled with \--quiet. ---depth=<n>:: - Maximum delta depth, for blob and tree deltification. - Default is 10. +Options for Frontends +~~~~~~~~~~~~~~~~~~~~~ ---active-branches=<n>:: - Maximum number of branches to maintain active at once. - See ``Memory Utilization'' below for details. Default is 5. +--cat-blob-fd=<fd>:: + Write responses to `cat-blob` and `ls` queries to the + file descriptor <fd> instead of `stdout`. Allows `progress` + output intended for the end-user to be separated from other + output. + +--date-format=<fmt>:: + Specify the type of dates the frontend will supply to + fast-import within `author`, `committer` and `tagger` commands. + See ``Date Formats'' below for details about which formats + are supported, and their syntax. + +--done:: + Terminate with error if there is no `done` command at the end of + the stream. This option might be useful for detecting errors + that cause the frontend to terminate before it has started to + write a stream. + +Locations of Marks Files +~~~~~~~~~~~~~~~~~~~~~~~~ --export-marks=<file>:: Dumps the internal marks table to <file> when complete. @@ -83,32 +95,33 @@ Like --import-marks but instead of erroring out, silently skips the file if it does not exist. ---relative-marks:: +--[no-]relative-marks:: After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location. ++ +Relative and non-relative marks may be combined by interweaving +--(no-)-relative-marks with the --(import|export)-marks= options. ---no-relative-marks:: - Negates a previous --relative-marks. Allows for combining - relative and non-relative marks by interweaving - --(no-)-relative-marks with the --(import|export)-marks= - options. +Performance and Compression Tuning +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---cat-blob-fd=<fd>:: - Write responses to `cat-blob` and `ls` queries to the - file descriptor <fd> instead of `stdout`. Allows `progress` - output intended for the end-user to be separated from other - output. +--active-branches=<n>:: + Maximum number of branches to maintain active at once. + See ``Memory Utilization'' below for details. Default is 5. ---done:: - Terminate with error if there is no `done` command at the - end of the stream. - This option might be useful for detecting errors that - cause the frontend to terminate before it has started to - write a stream. +--big-file-threshold=<n>:: + Maximum size of a blob that fast-import will attempt to + create a delta for, expressed in bytes. The default is 512m + (512 MiB). Some importers may wish to lower this on systems + with constrained memory. + +--depth=<n>:: + Maximum delta depth, for blob and tree deltification. + Default is 10. --export-pack-edges=<file>:: After creating a packfile, print a line of data to @@ -119,16 +132,9 @@ as these commits can be used as edge points during calls to 'git pack-objects'. ---quiet:: - Disable all non-fatal output, making fast-import silent when it - is successful. This option disables the output shown by - \--stats. - ---stats:: - Display some basic statistics about the objects fast-import has - created, the packfiles they were stored into, and the - memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with \--quiet. +--max-pack-size=<n>:: + Maximum size of each output packfile. + The default is unlimited. Performance
diff --git a/git-format-patch.html b/git-format-patch.html index dbb219e..439c705 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -755,7 +755,7 @@ [--start-number <n>] [--numbered-files] [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] + [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--cover-letter] [--quiet] [--notes[=<ref>]] [<common diff options>] @@ -1480,6 +1480,22 @@ </p> </dd> <dt class="hdlist1"> +-v <n> +</dt> +<dt class="hdlist1"> +--reroll-count=<n> +</dt> +<dd> +<p> + Mark the series as the <n>-th iteration of the topic. The + output filenames have <code>v<n></code> pretended to them, and the + subject prefix ("PATCH" by default, but configurable via the + <code>--subject-prefix</code> option) has ` v<n>` appended to it. E.g. + <code>--reroll-count=4</code> may produce <code>v4-0001-add-makefile.patch</code> + file that has "Subject: [PATCH v4 1/20] Add makefile" in it. +</p> +</dd> +<dt class="hdlist1"> --to=<email> </dt> <dd> @@ -1988,7 +2004,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-11-15 13:11:54 PST +Last updated 2013-01-12 00:25:04 PST </div> </div> </body> diff --git a/git-format-patch.txt b/git-format-patch.txt index 259dce4..9a914d0 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -18,7 +18,7 @@ [--start-number <n>] [--numbered-files] [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] + [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--cover-letter] [--quiet] [--notes[=<ref>]] [<common diff options>] @@ -166,6 +166,15 @@ allows for useful naming of a patch series, and can be combined with the `--numbered` option. +-v <n>:: +--reroll-count=<n>:: + Mark the series as the <n>-th iteration of the topic. The + output filenames have `v<n>` pretended to them, and the + subject prefix ("PATCH" by default, but configurable via the + `--subject-prefix` option) has ` v<n>` appended to it. E.g. + `--reroll-count=4` may produce `v4-0001-add-makefile.patch` + file that has "Subject: [PATCH v4 1/20] Add makefile" in it. + --to=<email>:: Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. diff --git a/git-shortlog.html b/git-shortlog.html index 73f9b9b..3b2c4e4 100644 --- a/git-shortlog.html +++ b/git-shortlog.html
@@ -838,6 +838,8 @@ and subsequent lines are indented by <code>indent2</code> spaces. <code>width</code>, <code>indent1</code>, and <code>indent2</code> default to 76, 6 and 9 respectively. </p> +<div class="paragraph"><p>If width is <code>0</code> (zero) then indent the lines of the output without wrapping +them.</p></div> </dd> </dl></div> </div> @@ -944,7 +946,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-09-17 16:55:59 PDT +Last updated 2013-01-12 00:25:04 PST </div> </div> </body>
diff --git a/git-shortlog.txt b/git-shortlog.txt index afeb4cd..c308e91 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt
@@ -56,6 +56,9 @@ line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively. ++ +If width is `0` (zero) then indent the lines of the output without wrapping +them. MAPPING AUTHORS
diff --git a/technical/api-run-command.html b/technical/api-run-command.html index 137f4bd..665b0a8 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html
@@ -818,10 +818,8 @@ <li> <p> If the program terminated due to a signal, then the return value is the - signal number - 128, ie. it is negative and so indicates an unusual - condition; a diagnostic is printed. This return value can be passed to - exit(2), which will report the same code to the parent process that a - POSIX shell’s $? would report for a program that died from the signal. + signal number + 128, ie. the same value that a POSIX shell’s $? would + report. A diagnostic is printed. </p> <div class="dlist"><dl> <dt class="hdlist1"> @@ -1151,7 +1149,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PST +Last updated 2013-01-12 00:25:04 PST </div> </div> </body>
diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt index f18b4f4..5d7d7f2 100644 --- a/technical/api-run-command.txt +++ b/technical/api-run-command.txt
@@ -55,10 +55,8 @@ non-zero. . If the program terminated due to a signal, then the return value is the - signal number - 128, ie. it is negative and so indicates an unusual - condition; a diagnostic is printed. This return value can be passed to - exit(2), which will report the same code to the parent process that a - POSIX shell's $? would report for a program that died from the signal. + signal number + 128, ie. the same value that a POSIX shell's $? would + report. A diagnostic is printed. `start_async`::
